Skip to content

darwin.libcxx: 21.1.6+apple-sdk-26.5 -> 22.1.6+apple-sdk-27.0 - #567433

Merged
reckenrode merged 2 commits into
NixOS:stagingfrom
reckenrode:push-kktznzxmyyyn
Oct 13, 2026
Merged

reckenrode merged 2 commits into
NixOS:stagingfrom
reckenrode:push-kktznzxmyyyn

Conversation

@reckenrode

Copy link
Copy Markdown
Contributor

After #564039, it’s time to update the system libc++ on Darwin. This will be needed by Swift 6.4 to link against the 27.0 SDK. Otherwise, using C++ with the 27.0 SDK will fail to compile.

Things done

@nixpkgs-ci
nixpkgs-ci Bot requested review from a team and balsoft and removed request for a team September 27, 2026 11:08
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Sep 27, 2026
@nixpkgs-ci
nixpkgs-ci Bot requested a review from a team September 27, 2026 11:19
@ofborg ofborg Bot added the 6.topic: darwin Running or building packages on Darwin label Sep 29, 2026
@reckenrode
reckenrode force-pushed the push-kktznzxmyyyn branch 2 times, most recently from eb54a27 to be6a37c Compare October 9, 2026 04:05

@Scrumplex Scrumplex left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes LGTM. I don't have enough experience to merge this though.

in-tree patch is functionally identical to https://github.com/llvm/llvm-project/commit/a558d656043734cc4d02e0a0a12e4c308c28f8c7.diff

Requesting review from @NixOS/llvm again to get some eyes on this before the feature freeze in two weeks.

For the release:

IMO the changes to LLVM are non-breaking so we can set the dead line for this to the regular feature freeze are libcxx changes might be breaking.

@nixpkgs-ci nixpkgs-ci Bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Oct 10, 2026

@booxter booxter left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed I can build and compile a simple C++ program with it.

@@ -1,16 +1,16 @@
{
# Use the text-based stubs and headers from the latest SDK (currently 15.x). This is safe because
# Use the text-based stubs and headers from the latest SDK (currently 27.x). This is safe because

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this seems to be a comment which is prone to rot. I'd drop the version instead.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

@nixpkgs-ci nixpkgs-ci Bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Oct 11, 2026
These specializations are technically UB. They were accepted by older
versions of libc++, but libc++ 22 is more strict, which causes the
current LLVM version to fail to build. Because Darwin links against the
system libc++, it will need these specializations fixed when it updates
to the system libc++ headers in the 27.0 SDK, which come from LLVM 22.
@reckenrode reckenrode mentioned this pull request Oct 13, 2026
8 of 19 tasks
@reckenrode
reckenrode added this pull request to the merge queue Oct 13, 2026
Merged via the queue into NixOS:staging with commit 6400aea Oct 13, 2026
27 checks passed
@reckenrode
reckenrode deleted the push-kktznzxmyyyn branch October 13, 2026 04:00
@Scrumplex Scrumplex moved this from In review to Done in 26.11 Blockers Oct 19, 2026
nixos-cuda-channel-updater Bot pushed a commit to nixos-cuda/nixpkgs that referenced this pull request Oct 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants